Merge "installer: Run the LESS compiler for *.less files"

diff --combined includes/installer/Installer.php
index 276c572,4f04c22..2f45005
--- 1/includes/installer/Installer.php
--- 2/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@@ -302,8 -302,7 +302,8 @@@ abstract class Installer 
        /**
         * URL to mediawiki-announce subscription
         */
 -      protected $mediaWikiAnnounceUrl = 'https://lists.wikimedia.org/mailman/subscribe/mediawiki-announce';
 +      protected $mediaWikiAnnounceUrl =
 +              'https://lists.wikimedia.org/mailman/subscribe/mediawiki-announce';
  
        /**
         * Supported language codes for Mailman
@@@ -984,7 -983,6 +984,7 @@@
                        $this->showMessage( 'config-using-server', $server );
                        $this->setVar( 'wgServer', $server );
                }
 +
                return true;
        }
  
@@@ -1003,11 -1001,7 +1003,11 @@@
                $IP = dirname( dirname( __DIR__ ) );
                $this->setVar( 'IP', $IP );
  
 -              $this->showMessage( 'config-using-uri', $this->getVar( 'wgServer' ), $this->getVar( 'wgScriptPath' ) );
 +              $this->showMessage(
 +                      'config-using-uri',
 +                      $this->getVar( 'wgServer' ),
 +                      $this->getVar( 'wgScriptPath' )
 +              );
  
                return true;
        }
@@@ -1201,8 -1195,7 +1201,8 @@@
                        }
                }
  
 -              // Uses messages 'config-unicode-using-php', 'config-unicode-using-utf8', 'config-unicode-using-intl'
 +              // Uses messages 'config-unicode-using-php', 'config-unicode-using-utf8',
 +              // 'config-unicode-using-intl'
                if ( $useNormalizer === 'php' ) {
                        $this->showMessage( 'config-unicode-pure-php-warning' );
                } else {
@@@ -1737,6 -1730,11 +1737,11 @@@
  
                // Some of the environment checks make shell requests, remove limits
                $GLOBALS['wgMaxShellMemory'] = 0;
+ 
+               // Don't bother embedding images into generated CSS, which is not cached
+               $GLOBALS['wgResourceLoaderLESSFunctions']['embeddable'] = function( $frame, $less ) {
+                       return $less->toBool( false );
+               };
        }
  
        /**

diff --combined includes/resourceloader/ResourceLoader.php
index ef999d9,e7ea20c..6380efc
--- 1/includes/resourceloader/ResourceLoader.php
--- 2/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -592,7 -592,7 +592,7 @@@ class ResourceLoader 
         * and clear out the output buffer. If the client cache is too old then do nothing.
         * @param $context ResourceLoaderContext
         * @param string $mtime The TS_MW timestamp to check the header against
 -       * @return bool True iff 304 header sent and output handled
 +       * @return bool True if 304 header sent and output handled
         */
        protected function tryRespondLastModified( ResourceLoaderContext $context, $mtime ) {
                // If there's an If-Modified-Since header, respond with a 304 appropriately
@@@ -1223,6 -1223,13 +1223,13 @@@
        public static function getLessCompiler() {
                global $wgResourceLoaderLESSFunctions, $wgResourceLoaderLESSImportPaths;
  
+               // When called from the installer, it is possible that a required PHP extension
+               // is missing (at least for now; see bug 47564). If this is the case, throw an
+               // exception (caught by the installer) to prevent a fatal error later on.
+               if ( !function_exists( 'ctype_digit' ) ) {
+                       throw new MWException( 'lessc requires the Ctype extension' );
+               }
+ 
                $less = new lessc();
                $less->setPreserveComments( true );
                $less->setVariables( self::getLESSVars() );

diff --combined resources/Resources.php
index 2c02de8,bd6e675..ec6c71b
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -87,7 -87,7 +87,7 @@@ return array
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.vector' => array(
-               // Keep in sync with WebInstallerOutput::getCSS()
+               // Used in the web installer. Test it after modifying this definition!
                'styles' => array(
                        'common/commonElements.css' => array( 'media' => 'screen' ),
                        'common/commonContent.css' => array( 'media' => 'screen' ),
@@@ -655,10 -655,7 +655,10 @@@
        ),
        'mediawiki.inspect' => array(
                'scripts' => 'resources/mediawiki/mediawiki.inspect.js',
 -              'dependencies' => 'jquery.byteLength',
 +              'dependencies' => array(
 +                      'jquery.byteLength',
 +                      'jquery.json',
 +              ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.feedback' => array(
@@@ -1109,8 -1106,9 +1109,9 @@@
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'mediawiki.legacy.config' => array(
+               // Used in the web installer. Test it after modifying this definition!
                'scripts' => 'common/config.js',
-               'styles' => array( 'common/config.css', 'common/config-cc.css' ),
+               'styles' => array( 'common/config.css' ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
@@@ -1132,6 -1130,7 +1133,7 @@@
                'position' => 'top',
        ),
        'mediawiki.legacy.shared' => array(
+               // Used in the web installer. Test it after modifying this definition!
                'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],